Draw shapes by default; fix currentPhase