Final Amendments

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>
JS Fix

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>