Slight adjustments

Commit history describes changes...