Stefan Schmidts feedback incorporated
manifest added