Bugs fixed. All test passed and the two features are working