Fixed black screen and attempted to fix bug