bug fixes as well as builtin and shorthand assign