more bug fixes, added usability