some fixes/additions