update 16

*BUGS? BAM! there all gone I hope