improvements

thoughts?