cleaned up minor issues and prepped for merge

fixed certain use cases and cleaned up extra code for make phase
transitions cleaner