-cleanup code spacing
-check for main thread before invoking on GCD for block code
-fixed problem with class methods being wrong