bug fixin

working on fixing bugs. still broken...