Integrated code and ran tests/bug fixes