merge from wesley
final touches