Fixed Transactional-Problem and removed Workarounds. Also added some comments.