better graphic, small bugs fixed