Starting to verify and clean up comments etc.