Import comments from Agda
Remove singletons dependency, update comments