Final commit

All tickets are fixed.