bug fixes and making the build debug...