Laola1 more fixes and cleanup