another commit, various changes