more fixes
deleted stuff