Inital commit with fixes