Better checks for multiple subs, single file bugfixes, default sleection bugfix