filename convention and small fixes