Quick updates to some of the code... Forgot to check in.