updated some notation stuff, need to keep working