1.5.1 Update (still few bugs left)