bug fixed... few...