bugs resolved
final changes, tested
tested changes
merge resolved