added features, fixed bugs, 1.1 update