Fixed parsing errors and bad notification.

Should clear things up a little