blacks to the switch whites to each other and not to to the switch (we brits use chock block for this but i belive you americans tend to use wirenuts).
you don't mention grounds but they should be connected together and if the plate or box is metal to that as well. i'm not sure if you are required to sleeve bare grounds in the USA but i'd highly reccomend doing so even if you aren't required to.