extended functionality, fixed issues