0.0.5 changes

also includes NFProps