Cleanup, minor changes, etc by Pistoleer