minor structural changes; less lib included