compiling all changes i've made.

not finished, but errors are still there and it bothers me.