Fixes for Issues 2, 3, and 4