everything done
minor cleanup