Few Updates, still buggy