added two more obstacle patterns, refactored a bit.