changed var names, finalized assignments
updated modules