fixing a few problems, sexifying code, etc...