made bug fixes for: