Fixed the unsatisfactory things

Now somewhat satisfied with the task. I seem to have managed to fit
everything in the task in.