level design pass and some bug fixes