changes apr 11, removed some warnings
deleted