bugs catched; re-structured a little