Fixed bugs, imporved usability