blah
fixing bugs for 1.4 final
merging master