Merged some things from other branches...