Cleaned up some stuff, added @LGnap as a contributor.