level work and bug fixes