fixes for code