1.1: fixed bugs from last commit.