add unsafe chapter + several fixes