Important changes & Various bug fixes