fixed most major bugs and started on new stuff