White listing and small cleanups

pretty please?