made the types more specific
added project and context listing
merge ee2a6576 -> c18e736c