Improve output, data acquisition and extras