Commit 6

Problems with the buffer in the dragon stopping me from finding anymore
errors. Some comments added to show you where