enhanced
small fixes