Minor bug fixes. Tested from iPhone3Gs up - portrait and landscape