some fixes and adding, no exercise yet