FIX: · Bugs fixes and improvements