couple small cleanups. Also fixed minor playtime bug.