tbb and mare fixed...
formating + some stubs