big changes
once again, forgot to add all new new stuff...