cleanup & corrections