Solved lots of bugs and added lots of little features