cleanup whitespace
add a few more controllers