Add comments and fix something..