Updated to 1.7.10 and a few extra additions/changes