various changes
final fixes