small issues debugged