fixes autoload and improve helper