Edited Tylers contributions, should be good now