initial commit (some fixes)