add offset_bottom support, test and small fixes