fixes to the persistence layer
annotation diffs - first attempt
add ghc to bundle