cleared out some uncompleted functions, bug fix with + string