cleaned up the api slightly
just a few things that were bothering me (added a generic id)