Cleanned up, better comentaries, makefile changed