added ball + minor fixes