cleanup

Solaris compatibility
SystemRequirements update
Manual changes