Minor changes. A few bugs I'm working on atm.