Added "More Native" option, armv7s Library and clean up code.