Adding comments and solving little bugs