Old functions restored

However, makers and data have been removed. They seem superflous. Help
needs to be rewritten anyway and is saved for later. The current build
is deemed stable and is to be merged onto master