changed aspect ratio, some minor edits
merge