services only

Some changes, deleted useless code, added lots of try catches