small fixes - getting rid of hardcoded values