Code Review, bug fixes and remaining functions for lwc