adding to shell and small bug fixes along the way