Many changes, started block place/break whitelist