More 'setup' functionality + fixes