Project cleaned a little bit, still full of questions