Fix some bugs, add new features and new bugs :)