Laola1 improvements and cleanup