Kevin/general stuff

General updates