fixes for sizes, sharing and other