Also some bug fix...