Lots of fixes. Working really well right now. Removed some old code.