Merged, Reenabled stuff, and fixed a couple issues. New Beta!
Bugfixes and preference adds. See Changelog