Minor changes, relates to #15