Minor bugs e tweaks