controller tidy and implementation of various other features