Final

small fixes