Various changes
I BROKE ABSOLUTELY NOTHING IN THE PREVIOUS COMMIT
Fix the warning message on enabling
More changes & fix author in the derped commit