Add comments, file selector and clean up