Comments from :arcturus addressed