general cleanup and update