New chapter

some nice bug fixes