Develop

All fxes after second review