basic update, bugs added bugs fixed