Initial Changes

Few minor changes to get it up.