3nd commit, some fixes