changes and small fixes