More bug fixes and some added features