Refactor terminal output a bit
Update to latest nighly
Fix records update