smser another commit (some bugs)