General updates, tweaks, and removal of redundant files.