fixed hash2d, made bus and train parcelable