Made changes asked for by Chris

or at least all necessary ones