Parcelable fixes

Now using List instead of arrays. This fixes some issues with parcelables.