Cleaned up some code and added missing images