more progress
fixed a bunch of stuff