small updates
Fixed some bugs, some bugs stil remain