improved arguement handling
minor fixes