Fixed uninitialized mem error when using fake data
minor cleanups, checks, and warning removal