some cleanup
some changes, genrandstring...