Small changes

Reduced some "uncompressable" code.
More small changes
merge