Fixed Everything that went wrong...phew!