some small bugs fixed etc.