Better image loading
Better image loading
Fixed several bugs