Added more fixes and changes to both python and node