Several fixes and some major changes