some smaller fixes/changes