Point layout & other small fixes.