[WIP] Cleanup, fix to line:col parsing