huge update
more stuff