+some bugs fixed YEY \m/