General updates - back to good ol awesome