FIXED minor things