fixed issue #11
fixed major bugs