pushing small fixes before getting coffee
merged