Updated, consolidated, upgraded and some good ol'fashion bug fixing