bug corrected + some adds