Fixed some usability and bugs