minor update
some more minor bugs
moar about the overal design
fixed some compile errors