Small fixes in Talks controller.

Just cleaning up the code a bit. Made a few FIXME comments too.