Add symantic version check, tidy up, fix remenus