fixing more damn bugs