fixed some smaller bugs, adapted parameters for testing