Minor Feature addition and bug removal