Adding additional features; Bug Fixes