fix for faster autoload, onReady did trigger too many times... and some minor adjustments