resolving some bugs during live play. Close to rooting them all out