added fixes from training session