Fist update

Added Prop Protection support, fixed few minor glitches.