Added items + some other things
Fixed potential memory leak