fixes and added features