Many fixes for 0.24 update. Don't want to list all of them (I know, bad) because dinner is ready. A couple more fixes needed.