fixed stuff and partial bug fixes
fixed stuff and partial bug fixes