Few fixes for errors
Few fixes for errors - more tomorrow