Some small changes, a few things that were missing