fixed a ton of bugs, almost have checklist