Fixed smaller bugs: v.1.3.2