final touches
more changes