adding paul's empty image fix, fixing build errors from merge
fixing images not loading, some formatting on files touched, fixing wrong bitmap util from merge