Development Tweaks

Just some tweaks that allow easier setup.