Many many bug fixs and redundencys