Added method headers and some small changes