jk not done yet, added a couple more things to Rd files & rebuilt