fixed some bugs an improved the usability