Added a bunch of stuff from jlord/hack-spots