fix micro bugs
fix new acceptance test
fix micro bugs