improved error handling
removed unneeded parcelables
more parcelables removed