small corrections - commit final (maybe)