further code updates. still broken.