Final Fixes for the evening

done for the evening