Merge other devs' additions and clean up a bit