misc lot of changes