fixes bugs, working on deployment