update alot

about time
squash some buggs