fix some stuff, training still needs work