General Updates and some fixes