final version1.0
small fixes