Some bug fixing, added shortcuts, updated NETRef