Code working on ubuntu
fixing bugs