fixes for !end