Polished code & added features