Implemented taking methods, other small fixes