a few changes and trials

I promise I didn't delete anything. everything should be revertable =]