fixes, reame, re-arranged params