some fixes and cleanups
formating....