Bug fix + minor update