fixed stuff that shaiv broke