cleanups
small rewording
add some ignore