Functionality is present, now latest bugs fixing