some missing bits; fixed binary programs / caching