bug fixes, design