moved autosource/functions to separate autoloadable functions w/ small modificiations also