couple bugs, added endpoints