clean up; increase stability; add portablizer port;