Just the changes we talked about in irc

Take it or leave it brother