Random Iprovments

Improved bits and pieces.