Fixing lines/tabs, adding some updates from Rob (kormoc)