Bug fixes, added startwith