work in progress
more fixes
updated
more changes
final fixes