Fixing #8 and fixing misspellings of Parcelable