Minor update

Some bug fixes and replaced Int64 with Int