#500 all bug fixed... i think...