General updates before pushing 0.0.2