level work, bug fixes