some minor changes and reoragnization