fixing stupid changes made yesterday
almost fixed...