fixed compile warnings, implemented more methods