4.1

Various bug fixed