Fixed misc

also simplified stuff
Images