general commit, small fixes