[STABLE] fixed up some things