updated annotation utils and reworks some methods