some fixes/ testing