added haddock for new stuff; renamed much in process
updated demo to new naming again