Some improvement and fixies