Tons of fixes everywhere.. Most bugs fixed. Also added some coloring
(however it does seem to slow down rendering time a bit)