2nd commit, some fixes