minor bug fixes with hardcode