fix bugs found whilst testing all the latest changes
Add rpm-build instructions