fixed bugs

Results look good!