Multiple improvements + started working on help cntroller