Added final tweaks and checked functionalities