Restructure, updates. Not happy with mode-line.