updated some stuff, fixed some bugs