small changes, comments etc~