Code cleanup and minor changes, some draft included
Merge branch 'develop' of github.com:guluc3m/gul-gultalks into develop