Various previously uncommitted fixes + arabianranta plugin