Some bug fixes
Merged
Some testing