Fix several issues, re upload