some final tweaks
Merge branch 'develop' of https://github.com/TheConstructors/QwikStubs into develop

pulling in more changes