Made some updates.
Fixed some bugs for non-Win8 users.