cleanup and fixing couople of small issues