syntax fixes

oops
start getting rid of rust warnings
get rid of most of the rustc warnings
Merge remote-tracking branch 'origin/refactoring'