Fixed collision with houses + some other small fixes