Added some fixes based on first testing.