First check, clean up and minor changes