Improved general program behaviour

Ready for automated update/install utility