Xcsoartools

Fix some minor bugs