resolved 2 issues
Fixed some tickets
Added some fixes