Code fixes and  improvements