lag fixes and restructure