various changes... look like I forgot to commit a while back