minor changes done at work.

DO NOT pull this version as it WILL mess up with your current work.