Minor features and changes #334