removed old block stuff and some other little changes