fixinging  various issues