Untested changes

I can't test this stuff right now because gmod wont tell me where to install addons.

Would be nice if anyone could test and pull those :)