Project: Several Changes

I cannot named them, please accept this patch