Made some updates and bug fixes