Major fixes and addings