Added some extra features
Added redirect stuff