some minor fixes plus preparing for FormIt addition

fixes for typos and consistency