Bug Fixes + Additions