Fix, update and clean up