Fixing some basic errors, setting up basic link to new ESUS