correcting things (excludes packages Entity, Server and World)