Bugfixes, a few tweaks, and New functions added