/u/SHIVADOC's beta repo

Tweaks and random stuff from /u/SHIVADOC.