fixes training and added todos