Commit #25 Some small changes