Fixed bug in get and changed comments