Implemented various extension allowances and fixed some puppetmaster stuff