Closes #307 latest fixes and checks done