More bug fixes + fixed headers since we are in 2013!