fix bugs here & there
fix lots of bugs :)