Cleaned up build settings and some minor code nits.