Fix and re-arrange after a long break...