Fixed more bugs, added extra block