Added checks when entering an occupied block
Minor tweaks