Fixed some bugs; improved usability.