Minor Changes to improve reliability and bug fixes