minor code cleanups + testing out 'DRAW' state