stack fixes. still broken.