Updates and fixed to restore funcionality and remove errors