make all levels call on proper level-tickets #27 / fixes and cleanup