I will definitely push up those two fronts if we start working on the full version. Thank you very much for your feedback. :)