More minor changes, still not working

Added debugging