WORLD13 on "[Theme:twentythirteen] fixed overlapping footer, but now single posts are broken"

Hi,

I followed the instructions in this helpful thread to fix the overlapping footer issue in twentythirteen: http://wordpress.org/support/topic/sidebar-overlaps-footer-in-twentythirteen

I made some modifications to the code in order to move the sidebar to the left and keep the content on the right as follows:

@media (min-width: 999px) {
	#main {
		overflow: hidden; /* needed to stretch parent container since children are floated */
	}
		#primary.content-area {
		width: 73%;
		float: right;
	}
	.site-main .sidebar-container {
		position: static;
		float: left;
		width: 27%;
		height: auto;
	}
	.sidebar .entry-header, .sidebar .entry-content, .sidebar .entry-summary, .sidebar .entry-meta {
		padding: 0 20px 0 0px;
	}

	.site-main .widget-area {
	padding: 27px 20px 20px 30px;
	}

}

I now have a couple of problems, however. First, posts that don't include a sidebar are now indented to the right instead of being centered. Any suggestions as to how to fix this?

Second, I now have about 300px of empty space between the bottom of the sidebar/content and the footer of the page. This space is only there in posts that contain a sidebar. What could be causing this?

I'm going a bit crazy trying to figure this out, so any help would be much appreciated.

Cheers!