FF: aperture.contains() now working

plus:
- simplify the shape logic
- log error if unknown shape
- default size=1
- some testing of shape options