Full Build Cleanup. (and corrections)

Signed-off-by: bootz <bootz@projectskyfire.org>