fixed #77, fixed #76, made placing better