fixed the pointer to be round and some additional TODO tasks