Fixed minors errors & Added handler + Scripts