Add levels and fix bugs