fix nullref for currentexercise
added parent reference
prepare merge
finish merge