Fix my errors because of stupid mistakes, added annotations to the methods.