Major plot position indication rebuild and other minor improvements