Finish up mode parsing (for now as lots of stuff needs to be done)