small updates to Unit and GoTo classes