"go to" function added + misc