Updated some changes from 0.3.3 testing.