resolved issues #1 and #2. Added testing