fixed bugs and usability