Issues

Fix issues #262 #402 #405 #403 and #416