Added in a bitmap and fixed several bugs.