Fixes to state generation

Fixed an error where if the generation got stuck or needed multiple cycles, it generated custom states multiple times.

Added better logging

Changed assemblies to use current branch