more levels, some bug fixes