fixed some chef bugs, and now it's more organized and consistent