Made things more like my style and fixed proxy derping