Some new some fixes, and some new bugs :P