Bug fixes - handle orientation change, strings, etc.