Changed around user stuff, preparing for SQLification.
Fixed some warnings whatchamacallit was whining about (probably a good thing though).