Various tweaks. Changing interface class include blocks