More typos, design fixes etc