fix basic functionality

working game flow, some issues remaining