little fixes, improved basic