I've done these modifications on the last three commits. Please take a look whenever you can.