various changes, add license