Some Fixes + Experimental Beta Canditate